Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Mon, 21 Jun 2010 12:18:05 +0000 (12:18 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Mon, 21 Jun 2010 12:18:05 +0000 (12:18 +0000)
commite5ba55294e8cab4f3d951703f000d2d80a83474e
treed140a949a1c4f5d1953a235f1b6a39ecb4a920b3
parent51a7d2e0f87c164361a1701620b0f446df261745
parent1c7f506c8e2b2b53e60e2f0dce50dfe508c388b9
Merge from mainline.